chore: format numbers using EN numerical formatting

Author: Wassim CHEGHAM

src/helpers.ts

@@ -1,3 +1,2 @@
 export const format = (num: number) => num.toLocaleString('en');
-
 export const descOrder = stats => (a, b) => stats[b] - stats[a];

src/stats/classes.ts

@@ -1,42 +1,29 @@
 import { SourceFile, TypeGuards, ClassDeclaration } from 'ts-simple-ast';
+import { format } from '../helpers';
 export default function(sourceFiles: SourceFile[]) {
   const classes = [];
   const classesAnnotated = [];
 
-
   // see: https://github.com/compodoc/ts-stats/issues/12#issuecomment-380791091
   function visit(decorator: string, stats: string[]) {
     stats.push(decorator);
   }
-  
+
   for (const sourceFile of sourceFiles) {
     sourceFile.forEachDescendant(descendant => {
       if (TypeGuards.isClassDeclaration(descendant)) {
-        const classeDeclaration = (descendant as ClassDeclaration);
+        const classeDeclaration = descendant as ClassDeclaration;
         if (classeDeclaration.getDecorators().length === 0) {
           visit(classeDeclaration.getName(), classes);
-        }
-        else {
+        } else {
           visit(classeDeclaration.getName(), classesAnnotated);
         }
       }
     });
   }
 
-  // sourceFiles.map(sourceFile => {
-  //   sourceFile.getClasses().map(classe => {
-  //     if (classe.getDecorators().length === 0) {
-  //       // get classes without decorators
-  //       classes.push(classe.getName());
-  //     } else {
-  //       // get classes with decorators
-  //       classesAnnotated.push(classe.getName());
-  //     }
-  //   });
-  // });
-
   return {
     keys: [['Classes', 'Classes (w/ annotation)', 'Classes (w/o annotation)'].join('\n')],
-    values: [[classesAnnotated.length + classes.length, classesAnnotated.length, classes.length].join('\n')]
+    values: [[format(classesAnnotated.length + classes.length), format(classesAnnotated.length), format(classes.length)].join('\n')]
   };
 }

src/stats/decorators.ts

@@ -1,16 +1,16 @@
 import { SourceFile, Node, TypeGuards } from 'ts-simple-ast';
 import { stat } from 'fs';
-
+import { format, descOrder } from '../helpers';
 
 export default function(sourceFiles: SourceFile[]) {
-  const stats: {[key: string]: number} = {};
-  
-  function visit(decorator: string, stats: {[key: string]: number}) {
+  const stats: { [key: string]: number } = {};
+
+  function visit(decorator: string, stats: { [key: string]: number }) {
     const _decorator = `@${decorator}()`;
     const entry = stats[_decorator];
     stats[_decorator] = (stats[_decorator] || 0) + 1;
   }
-  
+
   for (const sourceFile of sourceFiles) {
     sourceFile.forEachDescendant(descendant => {
       if (TypeGuards.isDecorator(descendant)) {
@@ -20,10 +20,15 @@ export default function(sourceFiles: SourceFile[]) {
   }
 
   return {
-    keys: [Object.keys(stats).join('\n')],
+    keys: [
+      Object.keys(stats)
+        .sort(descOrder(stats))
+        .join('\n')
+    ],
     values: [
       Object.keys(stats)
-        .map(k => stats[k])
+        .sort(descOrder(stats))
+        .map(k => format(stats[k]))
         .join('\n')
     ]
   };

src/stats/exports.ts

@@ -1,4 +1,5 @@
 import { SourceFile } from 'ts-simple-ast';
+import { format } from '../helpers';
 const KEY = 'Exports';
 const stats = { [KEY]: [] };
 export default function(sourcesFiles: SourceFile[]) {
@@ -13,14 +14,12 @@ export default function(sourcesFiles: SourceFile[]) {
   });
 
   return {
-    keys: [
-      [KEY, 'Exports (named)', 'Exports (default)'].join('\n')
-    ],
+    keys: [[KEY, 'Exports (named)', 'Exports (default)'].join('\n')],
     values: [
       [
-        stats[KEY].length,
-        stats[KEY].filter((c: string) => !c.startsWith('default_export_')).length,
-        stats[KEY].filter((c: string) => c.startsWith('default_export_')).length
+        format(stats[KEY].length),
+        format(stats[KEY].filter((c: string) => !c.startsWith('default_export_')).length),
+        format(stats[KEY].filter((c: string) => c.startsWith('default_export_')).length)
       ].join('\n')
     ]
   };

src/stats/files.ts

@@ -1,4 +1,5 @@
 import { SourceFile } from 'ts-simple-ast';
+import { format } from '../helpers';
 const KEY = 'TypeScript Files';
 const stats = { [KEY]: [] };
 export default function(sourcesFiles: SourceFile[]) {
@@ -8,6 +9,6 @@ export default function(sourcesFiles: SourceFile[]) {
 
   return {
     keys: [KEY],
-    values: [stats[KEY].length]
+    values: [format(stats[KEY].length)]
   };
 }

src/stats/imports.ts

@@ -1,4 +1,5 @@
 import { SourceFile } from 'ts-simple-ast';
+import { format } from '../helpers';
 const KEY = 'Imports';
 const stats = { [KEY]: [] };
 export default function(sourcesFiles: SourceFile[]) {
@@ -10,6 +11,6 @@ export default function(sourcesFiles: SourceFile[]) {
 
   return {
     keys: [KEY],
-    values: [stats[KEY].length]
+    values: [format(stats[KEY].length)]
   };
 }

src/stats/interfaces.ts

@@ -1,4 +1,5 @@
 import { SourceFile } from 'ts-simple-ast';
+import { format } from '../helpers';
 const KEY = 'Interfaces';
 const stats = { [KEY]: [] };
 export default function(sourcesFiles: SourceFile[]) {
@@ -10,6 +11,6 @@ export default function(sourcesFiles: SourceFile[]) {
 
   return {
     keys: [KEY],
-    values: [stats[KEY].length]
+    values: [format(stats[KEY].length)]
   };
 }

src/stats/loc.ts

@@ -1,4 +1,5 @@
 import { SourceFile } from 'ts-simple-ast';
+import { format } from '../helpers';
 const KEY = 'LOC (total)';
 const KEY1 = 'LOC (mean)';
 const KEY2 = 'LOC (median)';
@@ -53,6 +54,6 @@ export default function(sourcesFiles: SourceFile[]) {
 
   return {
     keys: [[KEY, KEY1, KEY2, KEY3].join('\n')],
-    values: [[total, mean, median, mode].join('\n')]
+    values: [[format(total), format(+mean), format(+median), format(+mode)].join('\n')]
   };
 }

src/stats/specs.ts

@@ -1,4 +1,5 @@
 import { SourceFile, SyntaxKind } from 'ts-simple-ast';
+import { format } from '../helpers';
 const KEY1 = 'Spec (files)';
 const KEY2 = 'Spec (describe)';
 const KEY2x = 'Spec (xdescribe)';
@@ -9,7 +10,7 @@ const KEY3f = 'Spec (fit)';
 const KEY4 = 'Spec (expect)';
 
 function filter(funcNames, by) {
-  return funcNames.filter(n => n === by).length
+  return funcNames.filter(n => n === by).length;
 }
 export default function(sourcesFiles: SourceFile[]) {
   const files = [];
@@ -46,6 +47,17 @@ export default function(sourcesFiles: SourceFile[]) {
 
   return {
     keys: [[KEY1, KEY2, KEY2x, KEY2f, KEY3, KEY3x, KEY3f, KEY4].join('\n')],
-    values: [[files.length, describe, xdescribe, fdescribe, it, xit, fit, expect].join('\n')]
+    values: [
+      [
+        format(files.length),
+        format(describe),
+        format(xdescribe),
+        format(fdescribe),
+        format(it),
+        format(xit),
+        format(fit),
+        format(expect)
+      ].join('\n')
+    ]
   };
 }