Merge pull request #750 from Speech-Rule-Engine/refactor/commander

Refactors commander loading into cli module
Speech-Rule-Engine · Apr 28, 2024 · f21fef9 · f21fef9
2 parents 468aa15 + 1e9a234
commit f21fef9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/ts/common/cli.ts b/ts/common/cli.ts
@@ -31,7 +31,15 @@ import { SystemExternal } from './system_external.js';
 import { Variables } from './variables.js';
 
 export class Cli {
-  public process = SystemExternal.extRequire('process');
+
+  public static process = SystemExternal.extRequire('process');
+
+  /**
+   * Commander library.
+   */
+  public static commander = SystemExternal.documentSupported
+    ? null
+    : SystemExternal.extRequire('commander');
 
   public setup: { [key: string]: string | boolean } = {
     mode: EngineConst.Mode.SYNC
@@ -41,7 +49,7 @@ export class Cli {
 
   public dp: DOMParser;
 
-  private output: any = this.process.stdout;
+  private output: any = Cli.process.stdout;
 
   constructor() {
     this.dp = new SystemExternal.xmldom.DOMParser({
@@ -148,7 +156,7 @@ export class Cli {
         }
         let i = 0;
         const header = order.map((x: string) => compStr(x, length[i++]));
-        const markdown = SystemExternal.commander.opts().pprint;
+        const markdown = Cli.commander.opts().pprint;
         const separator = length.map((x: number) =>
           new Array(x + 1).join(markdown ? '-' : '=')
         );
@@ -188,9 +196,9 @@ export class Cli {
    * to the given output file.
    */
   public readline() {
-    this.process.stdin.setEncoding('utf8');
+    Cli.process.stdin.setEncoding('utf8');
     const inter = SystemExternal.extRequire('readline').createInterface({
-      input: this.process.stdin,
+      input: Cli.process.stdin,
       output: this.output
     });
     let input = '';
@@ -220,7 +228,7 @@ export class Cli {
    * Method for the command line interface of the Speech Rule Engine
    */
   public async commandLine() {
-    const commander = SystemExternal.commander;
+    const commander = Cli.commander;
     const system = System;
     const set = ((key: string) => {
       return (val: string, def: string) => this.set(key, val, def);
@@ -367,9 +375,9 @@ export class Cli {
       .on('option:opt-all', () => {
         this.enumerate(true).then(() => System.exit(0));
       })
-      .parse(this.process.argv);
+      .parse(Cli.process.argv);
     await System.engineReady().then(() => System.setupEngine(this.setup));
-    const options = commander.opts();
+    const options = Cli.commander.opts();
     if (options.output) {
       this.output = SystemExternal.fs.createWriteStream(options.output);
     }
@@ -379,8 +387,8 @@ export class Cli {
     if (options.input) {
       this.execute(options.input);
     }
-    if (commander.args.length) {
-      commander.args.forEach(this.execute.bind(this));
+    if (Cli.commander.args.length) {
+      Cli.commander.args.forEach(this.execute.bind(this));
       System.engineReady().then(() =>
         Debugger.getInstance().exit(() => System.exit(0))
       );
@@ -408,7 +416,7 @@ export class Cli {
       }
     } catch (err) {
       console.error(err.name + ': ' + err.message);
-      Debugger.getInstance().exit(() => this.process.exit(1));
+      Debugger.getInstance().exit(() => Cli.process.exit(1));
     }
   }
 

diff --git a/ts/common/system_external.ts b/ts/common/system_external.ts
@@ -89,13 +89,6 @@ export class SystemExternal {
     Variables.VERSION +
     'mathmaps_ie.js';
 
-  /**
-   * Commander library.
-   */
-  public static commander = SystemExternal.documentSupported
-    ? null
-    : SystemExternal.extRequire('commander');
-
   /**
    * Filesystem library.
    */