#7 Minor improvements to index.js

+ Changed from [component] to [keyword] due to it actually being called keywords in dever.json
czprz · Dec 12, 2021 · 49d5235 · 49d5235
1 parent 216addd
commit 49d5235
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 91 deletions.
diff --git a/bin/environments/index.js b/bin/environments/index.js
@@ -28,13 +28,13 @@ module.exports = new class {
                 await this.#startOrStop(args);
                 break;
             case args.config:
-                this.#showConfig(args.component);
+                this.#showConfig(args.keyword);
                 break;
             case args.list:
                 this.#listAllComponents();
                 break;
             case args.location:
-                this.#showLocation(args.component);
+                this.#showLocation(args.keyword);
                 break;
             default:
                 this.#showHelp(yargs);
@@ -59,7 +59,7 @@ module.exports = new class {
      * @returns {Promise<void>}
      */
     async #startOrStop(args) {
-        const keyword = args.component != null ? args.component.toLowerCase() : null;
+        const keyword = args.keyword != null ? args.keyword.toLowerCase() : null;
 
         if (keyword == null) {
             console.error(`Must have a component keyword. Please attempt with ${chalk.blue('dever env [component]')}`);
@@ -73,7 +73,7 @@ module.exports = new class {
 
         const component = components_handler.getComponent(keyword);
         if (component == null) {
-            console.log('Could not find component');
+            console.error(chalk.redBright('Could not find component with keyword'));
             return;
         }
 
@@ -131,13 +131,13 @@ module.exports = new class {
      */
     #showLocation(keyword) {
         if (keyword == null) {
-            console.error(`Missing [component]. Please try again with ${chalk.green('dever env [component] --location')}`);
+            console.error(`Missing [keyword]. Please try again with ${chalk.green('dever env [keyword] --location')}`);
             return;
         }
 
         const component = components_handler.getComponent(keyword);
         if (component == null) {
-            console.error('Could not find component');
+            console.error(chalk.redBright('Could not find component with keyword'));
             return;
         }
 
@@ -158,7 +158,7 @@ module.exports = new class {
         }
 
         if (config == null) {
-            console.error(chalk.redBright(keyword == null ? 'Could not find dever configuration' : 'Could not find component'));
+            console.error(chalk.redBright(keyword == null ? 'Could not find dever configuration' : 'Could not find component with keyword'));
             return;
         }
 
@@ -171,7 +171,7 @@ module.exports = new class {
     #listAllComponents() {
         const components = components_handler.getAllComponents();
         if (components == null || components.length === 0) {
-            console.error(`could not find any components. Please try running ${chalk.green('dever init')}`);
+            console.error(`Could not find any components. Please try running ${chalk.green('dever init')}`);
             return;
         }
 
@@ -198,7 +198,7 @@ module.exports = new class {
      */
     #optionsWithoutComponent(yargs) {
         return yargs
-            .positional('component', {
+            .positional('keyword', {
                 describe: 'Keyword for component',
                 type: 'string'
             })
@@ -219,14 +219,9 @@ module.exports = new class {
      * @returns {object}
      */
     #optionsWithComponent(yargs, keyword) {
-        const component = components_handler.getComponent(keyword);
-        if (component == null) {
-            return null;
-        }
-
         const options = yargs
-            .positional('component', {
-                describe: 'Name of component to start or stop',
+            .positional('keyword', {
+                describe: 'Keyword for component',
                 type: 'string'
             })
             .option('start', {
@@ -250,6 +245,11 @@ module.exports = new class {
                 describe: 'Show component configuration'
             });
 
+        const component = components_handler.getComponent(keyword);
+        if (component == null) {
+            return options;
+        }
+
         const customOptions = this.#getCustomOptions(component.dependencies);
         return customOption.addOptionsToYargs(options, customOptions);
     }
@@ -417,7 +417,7 @@ class Args {
      * Component
      * @var {string}
      */
-    component;
+    keyword;
 
     /**
      * How component location

diff --git a/bin/fix/index.js b/bin/fix/index.js
@@ -13,8 +13,6 @@ module.exports = new class {
      * @returns {Promise<void>}
      */
     async handler(yargs, args) {
-        // Todo: Missing handling of fixes
-
         switch (true) {
             case args.list:
                 this.#showListOfProblems();
@@ -34,6 +32,7 @@ module.exports = new class {
      */
     getOptions(yargs) {
         const keyword = this.#getKeywordFromArgv(yargs.argv);
+        // Todo: How to handle .argv causing javascript execution not being able to continue when using --help
         return keyword == null ?
             this.#optionsWithoutComponent(yargs) :
             this.#optionsWithComponent(yargs, keyword);

diff --git a/bin/index.js b/bin/index.js
@@ -3,45 +3,38 @@
 const yargs = require("yargs")(process.argv.slice(2));
 
 const env = require('./environments');
-const install = require('./install');
 const init = require('./init');
 const fix = require('./fix');
 
-const usage = "\nUsage: dever <command> <option>";
 yargs
-    .usage(usage)
-    .command('init', 'Initialize dever', yargs => {
-        return yargs;
-    }, argv => {
-        init.init(argv);
-    })
-    .command('install', 'Install necessary dependencies for web and backend development', (yargs) => {
-        return yargs
-            .option('all', {
-                describe: 'Flag for installing both backend and web development dependencies'
-            })
-            .option('web', {
-                describe: 'Flag for only installing web development dependencies'
-            })
-            .option('backend', {
-                describe: 'Flag for only installing backend development dependencies'
-            });
-    }, (argv) => {
-        install.install(argv);
+    .usage('\nUsage: $0 <command> [keyword]')
+    .command({
+        command: 'init',
+        desc: 'Initializes dever and searches for dever.json files',
+        handler: (argv) => {
+            init.init(argv).catch(console.error);
+        }
     })
     .command('fix', 'Fix common possibly repeatable issues')
-    .command('fix [problem]', 'Fix common possibly repeatable issues', (yargs) => {
-        return fix.getOptions(yargs);
-    }, (argv) => {
-        fix.handler(yargs, argv).catch(console.error);
+    .command({
+        command: 'fix [problem]',
+        desc: 'Fix common possibly repeatable issues',
+        builder: (yargs) => fix.getOptions(yargs),
+        handler: (argv) => {
+            fix.handler(yargs, argv).catch(console.error);
+        }
     })
     .command('env', 'Development environment organizer')
-    .command('env [component]', 'Development environment organizer', (yargs) => {
-        return env.getOptions(yargs);
-    }, (argv) => {
-        env.handler(yargs, argv).catch(console.error);
+    .command({
+        command: 'env [keyword]',
+        desc: 'Development environment organizer',
+        builder: (yargs) => env.getOptions(yargs),
+        handler: (argv) => {
+            env.handler(yargs, argv).catch(console.error);
+        }
     })
-    .scriptName("dever");
+    .scriptName("dever")
+    .wrap(100);
 
 if (yargs.argv._.length === 0) {
     yargs.showHelp();

diff --git a/bin/init.js b/bin/init.js
@@ -8,6 +8,8 @@ module.exports = new class {
     async init() {
         const file = path.join(path.dirname(fs.realpathSync(__filename)), 'common/find_all_dever_json_files.ps1');
 
+        console.log('Initialization has started.. Please wait..');
+
         componentHandler.clearComponents();
 
         const raw = await powershell.executeFileSync(file);
@@ -16,6 +18,8 @@ module.exports = new class {
         for (const path of paths) {
             this.#getConfigFiles(path);
         }
+
+        console.log('Initialization has been completed!');
     }
 
     #getConfigFiles(filePath) {

diff --git a/package-lock.json b/package-lock.json