feat(api-client): create output dir even if path does not exists

closes #34

Signed-off-by: Vojtech Masek <vojtech.masek@flowup.cz>

Author: vmasek

src/generator.ts

@@ -1,5 +1,5 @@
-import * as fs from 'fs';
-import * as recursiveDir from 'mkdirp';
+import { exists, mkdir, readFile, writeFile } from 'fs';
+import { ensureDir } from 'fs-extra';
 import * as Mustache from 'mustache';
 import { dirname, join } from 'path';
 import { parse as swaggerFile } from 'swagger-parser';
@@ -10,8 +10,8 @@ import { createMustacheViewModel } from './parser';
 
 export async function generateAPIClient(swaggerFilePath: string, outputPath: string): Promise<void> {
   /* Create output folder if not already present */
-  if (!await promisify(fs.exists)(outputPath)) {
-    await promisify(fs.mkdir)(outputPath);
+  if (!await promisify(exists)(outputPath)) {
+    await ensureDir(outputPath);
   }
 
   const mustacheData = createMustacheViewModel(await swaggerFile(swaggerFilePath));
@@ -23,43 +23,42 @@ export async function generateAPIClient(swaggerFilePath: string, outputPath: str
 
 async function generateClient(viewContext: MustacheData, outputPath: string): Promise<void> {
   /* generate main API client class */
-  const clientTemplate = (await promisify(fs.readFile)(__dirname + '/../templates/ngx-service.mustache')).toString();
+  const clientTemplate = (await promisify(readFile)(`${__dirname}/../templates/ngx-service.mustache`)).toString();
 
   const result = Mustache.render(clientTemplate, viewContext);
   const outfile = join(outputPath, 'api-client.service.ts');
 
-  await promisify(fs.writeFile)(outfile, result, 'utf-8');
+  await promisify(writeFile)(outfile, result, 'utf-8');
 }
 
 async function generateModels(viewContext: MustacheData, outputPath: string): Promise<void> {
   const outputDir = join(outputPath, 'models');
   const outIndexFile = join(outputDir, '/index.ts');
 
-  const modelTemplate = (await promisify(fs.readFile)(__dirname + '/../templates/ngx-model.mustache')).toString();
-  const modelExportTemplate = (await promisify(fs.readFile)(__dirname + '/../templates/ngx-models-export.mustache')).toString();
+  const modelTemplate = (await promisify(readFile)(`${__dirname}/../templates/ngx-model.mustache`)).toString();
+  const modelExportTemplate = (await promisify(readFile)(`${__dirname}/../templates/ngx-models-export.mustache`)).toString();
 
-  if (!await promisify(fs.exists)(outputDir)) {
-    await promisify(fs.mkdir)(outputDir);
+  if (!await promisify(exists)(outputDir)) {
+    await promisify(mkdir)(outputDir);
   }
 
   // generate model export index here
-  fs.writeFileSync(outIndexFile, Mustache.render(modelExportTemplate, viewContext), 'utf-8');
+  await promisify(writeFile)(outIndexFile, Mustache.render(modelExportTemplate, viewContext), 'utf-8');
 
   // generate API models
-  viewContext.definitions.forEach((definition) => {
+  await Promise.all(viewContext.definitions.map(async (definition) => {
     const result = Mustache.render(modelTemplate, definition);
-    const outfile = join(outputDir, fileName(definition.name, definition.isEnum ? 'enum' : 'model') + '.ts');
+    const outfile = join(outputDir, `${fileName(definition.name, definition.isEnum ? 'enum' : 'model')}.ts`);
 
-    recursiveDir(dirname(outfile), () => {
-      fs.writeFileSync(outfile, result, 'utf-8');
-    });
-  });
+    await ensureDir(dirname(outfile));
+    return promisify(writeFile)(outfile, result, 'utf-8');
+  }));
 }
 
 async function generateModuleExportIndex(viewContext: MustacheData, outputPath: string): Promise<void> {
-  const exportTemplate = (await promisify(fs.readFile)(__dirname + '/../templates/ngx-module-export.mustache')).toString();
+  const exportTemplate = (await promisify(readFile)(`${__dirname}/../templates/ngx-module-export.mustache`)).toString();
   const result = Mustache.render(exportTemplate, viewContext);
   const outfile = join(outputPath, '/index.ts');
 
-  fs.writeFileSync(outfile, result, 'utf-8');
+  await promisify(writeFile)(outfile, result, 'utf-8');
 }

src/main.ts

@@ -2,7 +2,6 @@
 
 import { generateAPIClient } from './generator';
 import * as opt from 'optimist';
-import * as fs from 'fs';
 
 const optimist = opt
   .usage('Usage: api-client-generator -s path/to/swagger.[json|yaml]')
@@ -25,11 +24,6 @@ if (typeof argv.source === 'undefined' && argv.source !== true) {
 }
 
 const outputDir = argv.output || './output';
-
-if (!fs.existsSync(outputDir)) {
-  fs.mkdirSync(outputDir);
-}
-
 const sourceFile = argv.source;
 
 generateAPIClient(sourceFile, outputDir)

src/parser.ts

@@ -21,7 +21,6 @@ interface Definitions {
 
 export function createMustacheViewModel(swagger: Swagger): MustacheData {
   return {
-    description: swagger.info.description || '',
     isSecure: !!swagger.securityDefinitions,
     swagger: swagger,
     domain: determineDomain(swagger),