Add progress bar and update version

Odi-ts · Jan 12, 2019 · 6c9a5d0 · 6c9a5d0
1 parent 154659f
commit 6c9a5d0
Show file tree

Hide file tree

Showing 4 changed files with 109 additions and 86 deletions.
diff --git a/cli/commands/openapi.generate.ts b/cli/commands/openapi.generate.ts
@@ -22,8 +22,8 @@ export default function (program: CommanderStatic) {
         });
 }
 
-function action({ sources, entry, output, link, title }: any) {
-    const doc = generateOpenAPI(process.cwd(), sources, (entry || join(sources, './index.ts')));
+async function action({ sources, entry, output, link, title }: any) {
+    const doc = await generateOpenAPI(process.cwd(), sources, (entry || join(sources, './index.ts')));
 
     doc.info.title = title;
     doc.servers = link.map((link: string) => ({ url: link }));

diff --git a/cli/generators/openapi.generator.ts b/cli/generators/openapi.generator.ts
@@ -1,8 +1,5 @@
 import "reflect-metadata";
-import * as ora from 'ora';
-
-//@ts-ignore
-import * as spinner from 'cli-spinners';
+const Gauge = require("gauge");
 
 import { OpenAPIV3 } from 'openapi-types';
 
@@ -157,29 +154,26 @@ function processMethod(controller: typeof IController, handler: string, methodAS
     return descriptor;
 }
 
-function processController(controller: Constructor<IController>, classAST: ClassDeclaration): HandlerDescriptor[] {
-    const routePrefix = metadata(controller).getMetadata(CONTROLLER);
-    const routeMethods = reflectClassMethods(controller).filter(method => isRouteHandler(controller.prototype, method));
+async function processController(controller: Constructor<IController>, classAST: ClassDeclaration): Promise<HandlerDescriptor[]> {
+    return new Promise<any>(res =>  setTimeout(async () => {
+        const routePrefix = metadata(controller).getMetadata(CONTROLLER);
+        const routeMethods = reflectClassMethods(controller).filter(method => isRouteHandler(controller.prototype, method));
 
-    return routeMethods.map(method => {
-        const methodAST = classAST.getMethodOrThrow(method);
+        const result = routeMethods.map(method => {
+            const methodAST = classAST.getMethodOrThrow(method);
 
-        const descriptor = processMethod(controller, method, methodAST);
-        descriptor.path = concatinateBase(routePrefix.path, descriptor.path);
+            const descriptor = processMethod(controller, method, methodAST);
+            descriptor.path = concatinateBase(routePrefix.path, descriptor.path);
 
-        return descriptor;
-    });
-}
+            return descriptor;
+        });
 
-export function generateOpenAPI(base: string, sources: string, rootFile: string, ) {
-    //Wrap with loader
-    const jsLoader = ora({ text: 'Improting dependencies', spinner: spinner['dots'] }).start();   
+        res(result);
+    }, 200));
+}
 
+export async function generateOpenAPI(base: string, sources: string, rootFile: string, ) {
     const controllers = readControllers(base, [resolve(base, sources), `!${resolve(base, rootFile)}`]);
-
-    jsLoader.succeed('All dependencies improted');
-    //Finish
-
     const { version } = require(resolve(process.cwd(), './package.json'));
 
     const document: OpenAPIV3.Document = {
@@ -191,17 +185,26 @@ export function generateOpenAPI(base: string, sources: string, rootFile: string,
         paths: {}
     };
 
-    //Wrap with loader
-    const tsLoader = ora({ text: 'Processing controllers', spinner: spinner['dots'] }).start();   
+
+    let gt = new Gauge(process.stdout, {
+        updateInterval: 50,
+        theme: 'colorASCII'
+    });
+
+    let progress = 0;
+    gt.show('Start processing...', progress);
+
+    for (const [i, { classType, jsPath, tsPath }] of controllers.entries()) {
 
-    for (const { classType, jsPath, tsPath } of controllers) {
         const file = getProgram().addExistingSourceFile(tsPath);
         const classAST = file.getClass(classType.name);
 
+        gt.show(chalk.yellow('Processing: ') + classType.name, (100 / controllers.length * (i + 1))/ 100);
+
         if (!classAST)
             throw new Error(`Can't find class - ${classType.name} in ts file - ${tsPath}`);
 
-        const handlers = processController(classType, classAST);
+        const handlers = await processController(classType, classAST);
 
         handlers.forEach(({ path, method, ...descriptor }) => {
             const route = remapPath(path);
@@ -211,13 +214,10 @@ export function generateOpenAPI(base: string, sources: string, rootFile: string,
                 [method]: descriptor
             };
         });
+    }  
+    gt.hide();
 
-        tsLoader.text = `${classType} succesfully processed`;
-    }   
-
-    //Finish
-    tsLoader.succeed('Controllers successfully processed');
-
-    console.log(chalk`{green Done !}`);
+    console.log(chalk`{green ✔ Done!}`);
     return document;
-}
+}
+
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "odi",
-  "version": "0.2.26",
+  "version": "0.3.0",
   "description": "🌪🌌 Opinionated, Declarative, Idiomatic framework for building scalable, supportable, enterprise-grade applications.",
   "main": "lib/src/index.js",
   "homepage": "https://github.com/Odi-ts/Odi#readme",
@@ -66,9 +66,9 @@
     "esprima": "^4.0.1",
     "fastify": "^1.13.3",
     "fastify-cookie": "^2.1.5",
+    "gauge": "^2.7.4",
     "globby": "^8.0.2",
     "inquirer": "^6.2.1",
-    "ora": "^3.0.0",
     "reflect-metadata": "^0.1.12",
     "ts-simple-ast": "^20.0.0"
   },