feat(cli): add util shared functions and constants

marioestradarosa · marioestradarosa · commit f9f239ff8bfb · 2018-09-15T01:18:23.000-06:00
diff --git a/packages/cli/generators/model/index.js b/packages/cli/generators/model/index.js
@@ -30,12 +30,12 @@ module.exports = class ModelGenerator extends ArtifactGenerator {
   _setupGenerator() {
     this.artifactInfo = {
       type: 'model',
-      rootDir: 'src',
+      rootDir: utils.sourceRootDir,
     };
 
     this.artifactInfo.outDir = path.resolve(
       this.artifactInfo.rootDir,
-      'models',
+      utils.modelsDir,
     );
 
     // Model Property Types
@@ -190,8 +190,7 @@ module.exports = class ModelGenerator extends ArtifactGenerator {
     debug('scaffolding');
 
     // Data for templates
-    this.artifactInfo.fileName = utils.kebabCase(this.artifactInfo.name);
-    this.artifactInfo.outFile = `${this.artifactInfo.fileName}.model.ts`;
+    this.artifactInfo.outFile = utils.toModelFileName(this.artifactInfo.name);
 
     // Resolved Output Path
     const tsPath = this.destinationPath(
diff --git a/packages/cli/generators/repository/index.js b/packages/cli/generators/repository/index.js
@@ -47,7 +47,7 @@ module.exports = class RepositoryGenerator extends ArtifactGenerator {
     let fileContent = '';
     let modelFile = path.join(
       this.artifactInfo.modelDir,
-      `${utils.kebabCase(modelName)}.model.ts`,
+      utils.toModelFileName(modelName),
     );
     try {
       fileContent = this.fs.read(modelFile, {});
@@ -141,20 +141,20 @@ module.exports = class RepositoryGenerator extends ArtifactGenerator {
   _setupGenerator() {
     this.artifactInfo = {
       type: 'repository ',
-      rootDir: 'src',
+      rootDir: utils.sourceRootDir,
     };
 
     this.artifactInfo.outDir = path.resolve(
       this.artifactInfo.rootDir,
-      'repositories',
+      utils.repositoriesDir,
     );
     this.artifactInfo.datasourcesDir = path.resolve(
       this.artifactInfo.rootDir,
-      'datasources',
+      utils.datasourcesDir,
     );
     this.artifactInfo.modelDir = path.resolve(
       this.artifactInfo.rootDir,
-      'models',
+      utils.modelsDir,
     );
 
     this.artifactInfo.defaultTemplate = REPOSITORY_CRUD_TEMPLATE;
@@ -230,7 +230,11 @@ module.exports = class RepositoryGenerator extends ArtifactGenerator {
         'datasource',
         true,
       );
-      debug(`datasourcesList from src/datasources : ${datasourcesList}`);
+      debug(
+        `datasourcesList from ${utils.sourceRootDir}/${
+          utils.datasourcesDir
+        } : ${datasourcesList}`,
+      );
     } catch (err) {
       return this.exit(err);
     }
@@ -310,7 +314,11 @@ module.exports = class RepositoryGenerator extends ArtifactGenerator {
 
       this.options.model = utils.toClassName(this.options.model);
       // assign the model name from the command line only if it is valid
-      if (modelList.length > 0 && modelList.includes(this.options.model)) {
+      if (
+        modelList &&
+        modelList.length > 0 &&
+        modelList.includes(this.options.model)
+      ) {
         Object.assign(this.artifactInfo, {modelNameList: [this.options.model]});
       } else {
         modelList = [];
@@ -399,25 +407,29 @@ module.exports = class RepositoryGenerator extends ArtifactGenerator {
 
     if (this.options.name) {
       this.artifactInfo.className = utils.toClassName(this.options.name);
-      this.artifactInfo.outFile =
-        utils.kebabCase(this.options.name) + '.repository.ts';
+      this.artifactInfo.outFile = utils.toRepositoryFileName(this.options.name);
 
       // make sure the name supplied from cmd line is only used once
       delete this.options.name;
     } else {
       this.artifactInfo.className = utils.toClassName(
         this.artifactInfo.modelName,
       );
-      this.artifactInfo.outFile =
-        utils.kebabCase(this.artifactInfo.modelName) + '.repository.ts';
+      this.artifactInfo.outFile = utils.toRepositoryFileName(
+        this.artifactInfo.modelName,
+      );
     }
 
     if (debug.enabled) {
       debug(`Artifact output filename set to: ${this.artifactInfo.outFile}`);
     }
 
     const source = this.templatePath(
-      path.join('src', 'repositories', this.artifactInfo.defaultTemplate),
+      path.join(
+        utils.sourceRootDir,
+        utils.repositoriesDir,
+        this.artifactInfo.defaultTemplate,
+      ),
     );
 
     if (debug.enabled) {
diff --git a/packages/cli/lib/utils.js b/packages/cli/lib/utils.js
@@ -370,3 +370,24 @@ function validateValue(name, unallowedCharacters) {
   }
   return true;
 }
+/**
+ *  Returns the modelName in the directory file format for the model
+ * @param {string} modelName
+ */
+exports.toModelFileName = function(modelName) {
+  return `${_.kebabCase(modelName)}.model.ts`;
+};
+
+/**
+ * Returns the repositoryName in the directory file format for the repository
+ * @param {string} repositoryName
+ */
+exports.toRepositoryFileName = function(repositoryName) {
+  return `${_.kebabCase(repositoryName)}.repository.ts`;
+};
+
+// literal strings with artifacts directory locations
+exports.repositoriesDir = 'repositories';
+exports.datasourcesDir = 'datasources';
+exports.modelsDir = 'models';
+exports.sourceRootDir = 'src';
