Inserting log in validator and model

Author: andrelmlins

src/generators/ControllerGenerator.ts

@@ -5,13 +5,6 @@ import capitalize from '../utils/capitalize';
 import replaceMask from '../utils/replaceMask';
 import Log from '../Log';
 
-commander
-  .name(`recife-cli controller`)
-  .arguments('<controller-name>')
-  .action(name => createController(name))
-  .allowUnknownOption(false)
-  .parse(process.argv);
-
 const createController = (name: string) => {
   if (name) {
     Log.Instance.infoHeap(`Creating the controller`);
@@ -28,7 +21,7 @@ const createController = (name: string) => {
       fs.writeFileSync(target, replaceMask(contentFile, { name }));
 
       Log.Instance.successHeap(`The controller ${name} created.`);
-      Log.Instance.info(`Path: ${target}`);
+      Log.Instance.info(`Path: ${target}\n\n`);
     } catch (err) {
       Log.Instance.exception(err);
     }
@@ -39,3 +32,10 @@ const createController = (name: string) => {
     );
   }
 };
+
+commander
+  .name(`recife-cli controller`)
+  .arguments('<controller-name>')
+  .action(name => createController(name))
+  .allowUnknownOption(false)
+  .parse(process.argv);

src/generators/ModelGenerator.ts

@@ -3,35 +3,38 @@ import path from 'path';
 import commander from 'commander';
 import capitalize from '../utils/capitalize';
 import replaceMask from '../utils/replaceMask';
+import Log from '../Log';
 
-let modelName: string = '';
+const createModel = (name: string) => {
+  if (name) {
+    Log.Instance.infoHeap(`Creating the model`);
+
+    name = capitalize(name.replace(/Model|\.ts|\.js/g, ''));
+    name += 'Model';
+
+    const source = path.join(__dirname, '/../../templates/model/template');
+    const target = path.join(process.cwd(), 'src/models', `${name}.ts`);
+
+    try {
+      const contentFile = fs.readFileSync(source).toString();
+      fs.writeFileSync(target, replaceMask(contentFile, { name }));
+
+      Log.Instance.successHeap(`The model ${name} created.`);
+      Log.Instance.info(`Path: ${target}\n\n`);
+    } catch (err) {
+      Log.Instance.exception(err);
+    }
+  } else {
+    Log.Instance.errorHeap(`Specify the name model.`);
+    Log.Instance.info(
+      `For example: recife-cli model User\nRun --help for more information`
+    );
+  }
+};
 
 commander
   .name(`recife-cli model`)
   .arguments('<model-name>')
-  .action(name => (modelName = name))
+  .action(name => createModel(name))
   .allowUnknownOption(false)
   .parse(process.argv);
-
-if (modelName) {
-  modelName = capitalize(modelName.replace(/Model|\.ts|\.js/g, ''));
-
-  modelName += 'Model';
-
-  const source = path.join(__dirname, '/../../templates/model/template');
-  const target = path.join(process.cwd(), 'src/models', `${modelName}.ts`);
-
-  try {
-    const contentFile = fs.readFileSync(source).toString();
-    fs.writeFileSync(target, replaceMask(contentFile, { name: modelName }));
-
-    console.info(`\x1b[36mCreating the model ${modelName}.`, '\x1b[0m');
-    console.info(`Path: ${target}`, '\x1b[0m\n');
-  } catch (err) {
-    console.log(`\x1b[31m${err}\x1b[0m`);
-  }
-} else {
-  console.error('\x1b[31mSpecify the name model.', '\x1b[0m');
-  console.log(`  For example: recife-cli model User`);
-  console.log(`  Run --help for more information\n`);
-}

src/generators/ValidatorGenerator.ts

@@ -3,39 +3,39 @@ import path from 'path';
 import commander from 'commander';
 import capitalize from '../utils/capitalize';
 import replaceMask from '../utils/replaceMask';
+import Log from '../Log';
 
-let validatorName: string = '';
+const createValidator = (name: string) => {
+  if (name) {
+    Log.Instance.infoHeap(`Creating the validator`);
 
-commander
-  .name(`recife-cli validator`)
-  .arguments('<validator-name>')
-  .action(name => (validatorName = name))
-  .allowUnknownOption(false)
-  .parse(process.argv);
-
-if (validatorName) {
-  validatorName = capitalize(validatorName.replace(/Validator|\.ts|\.js/g, ''));
+    name = capitalize(name.replace(/Validator|\.ts|\.js/g, ''));
 
-  validatorName += 'Validator';
+    name += 'Validator';
 
-  const source = path.join(__dirname, '/../../templates/validator/template');
-  const target = path.join(
-    process.cwd(),
-    'src/validators',
-    `${validatorName}.ts`
-  );
+    const source = path.join(__dirname, '/../../templates/validator/template');
+    const target = path.join(process.cwd(), 'src/validators', `${name}.ts`);
 
-  try {
-    const contentFile = fs.readFileSync(source).toString();
-    fs.writeFileSync(target, replaceMask(contentFile, { name: validatorName }));
+    try {
+      const contentFile = fs.readFileSync(source).toString();
+      fs.writeFileSync(target, replaceMask(contentFile, { name }));
 
-    console.info(`\x1b[36mCreating the validator ${validatorName}.`, '\x1b[0m');
-    console.info(`Path: ${target}`, '\x1b[0m\n');
-  } catch (err) {
-    console.log(`\x1b[31m${err}\x1b[0m`);
+      Log.Instance.successHeap(`The validator ${name} created.`);
+      Log.Instance.info(`Path: ${target}\n\n`);
+    } catch (err) {
+      Log.Instance.exception(err);
+    }
+  } else {
+    Log.Instance.errorHeap(`Specify the name validator.`);
+    Log.Instance.info(
+      `For example: recife-cli validator User\nRun --help for more information`
+    );
   }
-} else {
-  console.error('\x1b[31mSpecify the name validator.', '\x1b[0m');
-  console.log(`  For example: recife-cli validator User`);
-  console.log(`  Run --help for more information\n`);
-}
+};
+
+commander
+  .name(`recife-cli validator`)
+  .arguments('<validator-name>')
+  .action(name => createValidator(name))
+  .allowUnknownOption(false)
+  .parse(process.argv);