1.0.11

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tsdoc",
-  "version": "1.0.6",
+  "version": "1.0.11",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tsdoc",
-  "version": "1.0.6",
+  "version": "1.0.11",
   "private": false,
   "description": "a tool for better documentation",
   "main": "dist/index.js",

ts/tsdoc.classes.mkdocs.ts

@@ -14,19 +14,54 @@ export class MkDocs {
     return result;
   }
 
+  public static async handleCommand(argvArg) {
+    const mkdocsInstance = new MkDocs(paths.cwd);
+    switch (true) {
+      case argvArg.serve:
+        await mkdocsInstance.serve();
+        break;
+      case argvArg.publish:
+        await mkdocsInstance.publish();
+        break;
+      default:
+        await mkdocsInstance.compile();
+        break;
+    }
+  }
+
   // Instance
   public typedocDirectory: string;
   constructor(dirPathArg) {
-    this.typedocDirectory = dirPathArg; 
+    this.typedocDirectory = dirPathArg;
   }
 
-  public async compile () {
+  public async update() {
+    await this.smartshellInstance.exec(
+      `docker pull registry.gitlab.com/hosttoday/ht-docker-mkdocs`
+    );
+  }
+
+  public async compile() {
+    await this.update();
     await this.smartshellInstance.exec(`rm -rf public/`);
-    await this.smartshellInstance.exec(`docker run --rm -it -p 8000:8000 -v ${paths.cwd}:/docs mkdocs build`);
+    await this.smartshellInstance.exec(
+      `docker run --rm -p 8000:8000 -v ${
+        paths.cwd
+      }:/docs registry.gitlab.com/hosttoday/ht-docker-mkdocs build`
+    );
+  }
+
+  public async serve() {
+    await this.update();
+    await this.smartshellInstance.exec(
+      `docker run --rm -p 8000:8000 -v ${
+        paths.cwd
+      }:/docs registry.gitlab.com/hosttoday/ht-docker-mkdocs`
+    );
+  }
+
+  public async publish() {
+    await this.compile();
     await this.smartshellInstance.exec(`gitzone commit`);
   }
-
-  public async serve () {
-    await this.smartshellInstance.exec(`docker run --rm -it -p 8000:8000 -v ${paths.cwd}:/docs registry.gitlab.com/hosttoday/ht-docker-mkdocs`);
-  }
 }

ts/tsdoc.classes.typedoc.ts

@@ -18,10 +18,12 @@ export class TypeDoc {
   // Instance
   public typedocDirectory: string;
   constructor(dirPathArg) {
-    this.typedocDirectory = dirPathArg; 
+    this.typedocDirectory = dirPathArg;
   }
 
-  public async compile () {
-    await this.smartshellInstance.exec(`typedoc --module "commonjs" --target "ES2016" --out public/ ts/`);
+  public async compile() {
+    await this.smartshellInstance.exec(
+      `typedoc --module "commonjs" --target "ES2016" --out public/ ts/`
+    );
   }
 }

ts/tsdoc.cli.ts

@@ -8,10 +8,13 @@ import { MkDocs } from './tsdoc.classes.mkdocs';
 export const run = async () => {
   const tsdocCli = new plugins.smartcli.Smartcli();
   tsdocCli.addCommand('typedoc').subscribe(async argvArg => {
-
+    const typeDocInstance = new TypeDoc(paths.cwd);
+    await typeDocInstance.compile();
   });
 
-  tsdocCli.addCommand('mkdocs').subscribe(async argvArg => {});
+  tsdocCli.addCommand('mkdocs').subscribe(async argvArg => {
+    await MkDocs.handleCommand(argvArg);
+  });
 
   tsdocCli.standardTask().subscribe(async argvArg => {
     logger.log('warn', `Auto detecting environment!`);
@@ -19,11 +22,10 @@ export const run = async () => {
       case await TypeDoc.isTypeDocDir(paths.cwd):
         logger.log('ok', `Detected TypeDoc compliant directory at ${paths.cwd}`);
         tsdocCli.trigger('typedoc');
-        const typeDocInstance = new TypeDoc(paths.cwd);
-        await typeDocInstance.compile();
         break;
       case await MkDocs.isMkDocsDir(paths.cwd):
-      logger.log('ok', `Detected MkDocs compliant directory at ${paths.cwd}`);
+        logger.log('ok', `Detected MkDocs compliant directory at ${paths.cwd}`);
+        tsdocCli.trigger('mkdocs');
         break;
       default:
         logger.log('error', `Cannot determine docs format at ${paths.cwd}`);