reducing complexity of file ts (#46)

Author: jjmschofield

src/lib/ownership/file.ts

@@ -3,28 +3,39 @@ import { OwnedFile } from './lib/OwnedFile';
 import { OwnershipEngine } from './lib/OwnershipEngine';
 import { readDirRecursively } from './lib/readDirRecursively';
 import { readTrackedGitFiles } from './lib/readTrackedGitFiles';
+import { countLinesInFile } from './lib/countLinesInFile';
 
 export const getFileOwnership = async (options: { codeowners: string, dir: string, onlyGit: boolean, root?: string }): Promise<OwnedFile[]> => {
+  const filePaths = await getFilePaths(options.dir, options.onlyGit, options.root);
+
   const engine = OwnershipEngine.FromCodeownersFile(options.codeowners);
 
+  const files: OwnedFile[] = [];
+
+  for (const filePath of filePaths) {
+    const owners = engine.calcFileOwnership(filePath);
+    const lines = await countLinesInFile(filePath);
+
+    files.push(new OwnedFile({ path: filePath, owners, lines }));
+  }
+
+  return files;
+};
+
+const getFilePaths = async (dir: string, onlyGit: boolean, root?: string) => {
   let filePaths;
-  if (options.onlyGit) {
-    filePaths = await readTrackedGitFiles(options.dir);
+
+  if (onlyGit) {
+    filePaths = await readTrackedGitFiles(dir);
   } else {
-    filePaths = await readDirRecursively(options.dir, ['.git']);
+    filePaths = await readDirRecursively(dir, ['.git']);
   }
 
-  if (options.root) { // We need to re-add the root so that later ops can find the file
-    filePaths = filePaths.map(filePath => path.join(<string>options.root, filePath));
+  if (root) { // We need to re-add the root so that later ops can find the file
+    filePaths = filePaths.map(filePath => path.join(root, filePath));
   }
 
   filePaths.sort();
 
-  const files: OwnedFile[] = [];
-
-  for (const filePath of filePaths) {
-    files.push(await OwnedFile.FromPath(filePath, engine));
-  }
-
-  return files;
+  return filePaths;
 };

src/lib/ownership/lib/OwnedFile.ts

@@ -1,6 +1,5 @@
 import { OwnershipEngine } from './OwnershipEngine';
-import * as fs from 'fs';
-import { log } from '../../logger';
+import { countLinesInFile } from './countLinesInFile';
 
 export class OwnedFile {
   // tslint:disable-next-line:variable-name
@@ -43,19 +42,3 @@ export class OwnedFile {
     });
   }
 }
-
-const countLinesInFile = async (filePath: string): Promise<number> => {
-  let i;
-  let count = 0;
-  return new Promise((resolve, reject) => {
-    fs.createReadStream(filePath)
-      .on('error', (e) => {
-        log.error(`failed to read lines from file ${filePath}`, e);
-        reject(e);
-      })
-      .on('data', (chunk) => {
-        for (i = 0; i < chunk.length; ++i) if (chunk[i] === 10) count++;
-      })
-      .on('end', () => resolve(count));
-  });
-};

src/lib/ownership/lib/countLinesInFile.ts

@@ -0,0 +1,18 @@
+import * as fs from 'fs';
+import { log } from '../../logger';
+
+export const countLinesInFile = async (filePath: string): Promise<number> => {
+  let i;
+  let count = 0;
+  return new Promise((resolve, reject) => {
+    fs.createReadStream(filePath)
+      .on('error', (e) => {
+        log.error(`failed to read lines from file ${filePath}`, e);
+        reject(e);
+      })
+      .on('data', (chunk) => {
+        for (i = 0; i < chunk.length; ++i) if (chunk[i] === 10) count++;
+      })
+      .on('end', () => resolve(count));
+  });
+};