Merge pull request #21 from peterlenagh/feat/dynamic-template-paths

feat(templates): dynamic template paths

Author: fmvilas

README.md

@@ -86,9 +86,14 @@ And some template files like this:
  |- index.js.hbs       // This is a static template, it contains placeholders that will be filled in, e.g. includes for each file in routes
  |+ routes/
   |- $$path$$.route.js.hbs      // This file will be generated for each operation and contains skeleton code for each method for an operation.
+  |+ $$path$$/                  // This folder will also be generated for each operation.
+    |- route.js.hbs             // This is another example of an operation file.
 ```
 The first important thing to notice here is the variable notation in `$$path$$.route.js.hbs`. It will be replaced by the name of the path.
 
+This example also shows `$$path$$` used in a folder name - the generated folder names here will replace $$path$$ with
+the name of the path (in kebab-case).
+
 In this example the generated directory structure will be like this:
 ```
 |- index.js            // This file still contains static code like before.
@@ -98,7 +103,11 @@ In this example the generated directory structure will be like this:
   |- pet.route.js      // This file contains the code for methods on pets.
   |                    // (e.g. getPet, postPet, getPetByPetId).
   |- user.route.js     // This file will contain the code for methods on users.
-                       // (e.g. postUserLogin, getUserByUsername, putUserByUsername, deleteUserByUsername).
+  |                    // (e.g. postUserLogin, getUserByUsername, putUserByUsername, deleteUserByUsername).
+  |+ pet/
+   | - route.js        // this file also contains the code for methods on pets.
+  |+ user/
+   | - route.js        // this file also contains the code for methods on users.
 ```
 
 ### Template file extensions

lib/generator.js

@@ -96,7 +96,10 @@ const generateFile = options => new Promise((resolve, reject) => {
 const generateOperationFile = (config, operation, operation_name) => new Promise((resolve, reject) => {
   fs.readFile(path.join(config.root, config.file_name), 'utf8', (err, data) => {
     if (err) return reject(err);
-    const subdir = config.root.replace(new RegExp(`${config.templates_dir}[/]?`),'');
+    const subdir = config.root
+        .replace(new RegExp(`${config.templates_dir}[/]?`),'')
+        .replace("$$path$$", _.kebabCase(operation_name));
+
     const new_filename = config.file_name.replace('$$path$$', operation_name).replace(/.hbs$/, '');
     const target_file = path.resolve(config.target_dir, subdir, new_filename);
     const template = Handlebars.compile(data.toString());
@@ -108,6 +111,7 @@ const generateOperationFile = (config, operation, operation_name) => new Promise
       openapi: config.data.openapi
     });
 
+    xfs.mkdirpSync(path.dirname(target_file));
     fs.writeFile(target_file, content, 'utf8', (err) => {
       if (err) return reject(err);
       resolve();
@@ -166,7 +170,7 @@ const generateDirectoryStructure = config => new Promise((resolve, reject) => {
 
   walker.on('file', async (root, stats, next) => {
     try {
-      if (stats.name.includes('$$path$$')) {
+      if (stats.name.includes('$$path$$') || root.includes("$$path$$")) {
         // this file should be handled for each in openapi.paths
         await generateOperationFiles({
           root,
@@ -199,7 +203,13 @@ const generateDirectoryStructure = config => new Promise((resolve, reject) => {
   walker.on('directory', async (root, stats, next) => {
     try {
       const dir_path = path.resolve(target_dir, path.relative(templates_dir, path.resolve(root, stats.name)));
-      if (stats.name !== PARTIALS_DIRNAME && stats.name !== HELPERS_DIRNAME) xfs.mkdirpSync(dir_path);
+      if (
+        stats.name !== PARTIALS_DIRNAME &&
+        stats.name !== HELPERS_DIRNAME &&
+        !stats.name.includes("$$path$$")
+      ) {
+        xfs.mkdirpSync(dir_path);
+      }
       next();
     } catch (e) {
       reject(e);