Subfolders to Dependencies

lib/cli/input/eval.js → lib/cli/input/eval/eval.js

@@ -1,9 +1,9 @@
 const inquirer = require('inquirer');
-const PromptGenerator = require('../../utils/PromptGenerator');
-const preferenceManager = require('../../utils/preference-manager');
+const PromptGenerator = require('@utils/PromptGenerator');
+const preferenceManager = require('@utils/preference-manager');
 const path = require('path');
 
-const defaultPrefPath = path.join(__dirname, '../../../default-prefs.json');
+const defaultPrefPath = path.join(__dirname, '../../../../default-prefs.json');
 const defaultPrefs = JSON.parse(require('fs').readFileSync(defaultPrefPath, 'utf8'));
 
 const { supportedLanguages } = defaultPrefs;

lib/cli/input/eval/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@input/eval",
+  "main": "eval.js",
+  "version": "0.0.0"
+}

lib/cli/input/init.js → lib/cli/input/init/init.js

@@ -1,5 +1,5 @@
 const inquirer = require('inquirer');
-const PromptGenerator = require('../../utils/PromptGenerator');
+const PromptGenerator = require('@utils/PromptGenerator');
 
 const getLengthValidator = invalidMessage => (value) => {
   if (value.length) {

lib/cli/input/init/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@input/init",
+  "main": "init.js",
+  "version": "0.0.0"
+}

lib/cli/input/prefs/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@input/prefs",
+  "main": "prefs.js",
+  "version": "0.0.0"
+}

lib/cli/input/prefs.js → lib/cli/input/prefs/prefs.js

@@ -1,9 +1,9 @@
 const inquirer = require('inquirer');
 const validator = require('validator');
 const path = require('path');
-const PromptGenerator = require('../../utils/PromptGenerator');
+const PromptGenerator = require('@utils/PromptGenerator');
 
-const defaultPrefPath = path.join(__dirname, '../../../default-prefs.json');
+const defaultPrefPath = path.join(__dirname, '../../../../default-prefs.json');
 const defaultPrefs = JSON.parse(require('fs').readFileSync(defaultPrefPath, 'utf8'));
 
 const { supportedLanguages } = defaultPrefs;

lib/cli/output/eval.js → lib/cli/output/eval/eval.js

@@ -2,7 +2,7 @@ const chalk = require('chalk');
 const { Spinner } = require('cli-spinner');
 const Table = require('cli-table');
 
-const spinner = new Spinner('Evaluating you submission, please wait...');
+const spinner = new Spinner('Evaluating your submission, please wait...');
 
 const startSpinner = () => {
   spinner.setSpinnerString(0);
@@ -14,7 +14,7 @@ const stopSpinner = () => {
 };
 
 const onInvalidRequest = () => {
-  console.log(chalk.red('\nAccess Denied. Please try submitting again'));
+  console.log(chalk.red('\nAccess Denied. Please try submitting again.'));
 };
 
 const onSubmissionPending = () => {

lib/cli/output/eval/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@output/eval",
+  "main": "eval.js",
+  "version": "0.0.0"
+}

lib/cli/output/exit/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@output/exit",
+  "main": "exit.js",
+  "version": "0.0.0"
+}

lib/cli/output/init/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@output/init",
+  "main": "init.js",
+  "version": "0.0.0"
+}

lib/cli/output/prefs/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@output/prefs",
+  "main": "prefs.js",
+  "version": "0.0.0"
+}

lib/cli/output/prefs.js → lib/cli/output/prefs/prefs.js

@@ -30,7 +30,7 @@ const sendOutput = (event) => {
       showPrefs(event.details);
       break;
     case 'invalid_lang':
-      console.log(chalk.red(`Please provide the a valid language. The supported languages are ${event.details.supportedLanguages}`));
+      console.log(chalk.red(`Please provide a valid language. The supported languages are ${event.details.supportedLanguages}`));
       break;
     case 'invalid_host':
       console.log(chalk.red('Please provide a valid host'));

lib/controller/eval.js

@@ -1,7 +1,7 @@
-const evalInput = require('../cli/input/eval');
-const evalOutput = require('../cli/output/eval');
-const evalModel = require('../model/eval');
-const commandValidator = require('../utils/command-validator');
+const evalInput = require('@input/eval');
+const evalOutput = require('@output/eval');
+const evalModel = require('@model/eval');
+const commandValidator = require('@utils/command-validator');
 
 const onEvalResult = (evalResult) => {
   evalOutput.sendOutput(evalResult);

lib/controller/exit.js

@@ -1,6 +1,6 @@
-const commandValidator = require('../utils/command-validator');
-const exitOutput = require('../cli/output/exit');
-const exitModel = require('../model/exit');
+const commandValidator = require('@utils/command-validator');
+const exitOutput = require('@output/exit');
+const exitModel = require('@model/exit');
 
 const onExit = async (args, options, logger) => {
   const isValidSession = commandValidator.validateSession();

lib/controller/index.js

@@ -1,5 +1,5 @@
 const program = require('caporal');
-const preferenceManager = require('../utils/preference-manager');
+const preferenceManager = require('@utils/preference-manager');
 
 const init = require('./init');
 const exit = require('./exit');

lib/controller/init.js

@@ -1,6 +1,6 @@
-const initInput = require('../cli/input/init');
-const initOutput = require('../cli/output/init');
-const initModel = require('../model/init');
+const initInput = require('@input/init');
+const initOutput = require('@output/init');
+const initModel = require('@model/init');
 
 const onInit = async (args, options, logger) => {
   initOutput.sendOutput({

lib/controller/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "controller",
+  "main": "index.js",
+  "version": "0.0.0"
+}

lib/controller/prefs.js

@@ -1,6 +1,6 @@
-const prefsInput = require('../cli/input/prefs');
-const prefsOutput = require('../cli/output/prefs');
-const prefsModel = require('../model/prefs');
+const prefsInput = require('@input/prefs');
+const prefsOutput = require('@output/prefs');
+const prefsModel = require('@model/prefs');
 
 const onPrefs = async (args, options, logger) => {
   let changePrefEvent = await prefsInput.getInput(args, options);

lib/model/eval.js → lib/model/eval/eval.js

@@ -1,5 +1,5 @@
 const io = require('socket.io-client');
-const preferenceManager = require('../utils/preference-manager');
+const preferenceManager = require('@utils/preference-manager');
 
 const connectToSocket = () => {
   const cliPrefs = preferenceManager.getPreference({ name: 'cliPrefs' });

lib/model/eval/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@model/eval",
+  "main": "eval.js",
+  "version": "0.0.0"
+}

lib/model/exit.js → lib/model/exit/exit.js

@@ -1,4 +1,4 @@
-const preferenceManager = require('../utils/preference-manager');
+const preferenceManager = require('@utils/preference-manager');
 
 const logout = () => {
   preferenceManager.deleteCredentials();

lib/model/exit/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@model/exit",
+  "main": "exit.js",
+  "version": "0.0.0"
+}

lib/model/init.js → lib/model/init/init.js

@@ -1,5 +1,5 @@
 const requestPromise = require('request-promise');
-const preferenceManager = require('../utils/preference-manager');
+const preferenceManager = require('@utils/preference-manager');
 
 const fetchPrivateToken = async (host, username, password) => {
   const options = {

lib/model/init/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@model/init",
+  "main": "init.js",
+  "version": "0.0.0"
+}

lib/model/prefs/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@model/prefs",
+  "main": "prefs.js",
+  "version": "0.0.0"
+}

lib/model/prefs.js → lib/model/prefs/prefs.js

@@ -1,4 +1,4 @@
-const preferenceManager = require('../utils/preference-manager');
+const preferenceManager = require('@utils/preference-manager');
 
 const eventForShowPref = (changePrefEvent) => {
   const cliPrefs = preferenceManager.getPreference({ name: 'cliPrefs' });

lib/utils/PromptGenerator/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@utils/PromptGenerator",
+  "main": "PromptGenerator.js",
+  "version": "0.0.0"
+}

lib/utils/command-validator.js → lib/utils/command-validator/command-validator.js

@@ -1,5 +1,5 @@
 const chalk = require('chalk');
-const preferenceManager = require('./preference-manager');
+const preferenceManager = require('@utils/preference-manager');
 
 const maxMillisecodsDiff = 2 * 60 * 60 * 1000;
 

lib/utils/command-validator/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@utils/command-validator",
+  "main": "command-validator.js",
+  "version": "0.0.0"
+}

lib/utils/preference-manager/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@utils/preference-manager",
+  "main": "preference-manager.js",
+  "version": "0.0.0"
+}

lib/utils/preference-manager.js → lib/utils/preference-manager/preference-manager.js

@@ -5,7 +5,7 @@ const os = require('os');
 
 const prefDirectory = `${os.homedir()}/.autolabjs`;
 
-const defaultPrefPath = path.join(__dirname, '../../default-prefs.json');
+const defaultPrefPath = path.join(__dirname, '../../../default-prefs.json');
 const defaultPrefs = JSON.parse(require('fs').readFileSync(defaultPrefPath, 'utf8'));
 
 const defaultLang = defaultPrefs.submission.language;